merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Tue, 24 Apr 2007 15:26:32 +0000 (09:26 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Tue, 24 Apr 2007 15:26:32 +0000 (09:26 -0600)

Trivial merge